Bug: Issue 10956 Change-Id: I0e54cc837e35cf88b20b689f4f28fb992ae5fcb5 (cherry picked from commit 486fd92d7d)
486fd92d7d