Bug: Issue 8701 Change-Id: I2b9bef67cc0c4ca8e5f379609ba473f30c4344fb (cherry picked from commit 02fab7a08f)
02fab7a08f