Bug: Issue 10710 Change-Id: I49a8029bc4bf48bcbfc743e72d2dc799f9e8691b (cherry picked from commit 0037f28f07)
0037f28f07