Bug: Issue 9776 Change-Id: Ide3b849a9dbe1c26b7787a514c503f97bce9ef31 (cherry picked from commit 71bc7f33d2)
71bc7f33d2