Bug: Issue 10415 Change-Id: I004b66ca39b56b801637a0a0ade6192387ed91d1 (cherry picked from commit f73f67d252)
f73f67d252