Bug: Issue 7406 Change-Id: Ia7be6898bc00dbe9273f061761566587786f930e (cherry picked from commit 0771a491c8)
0771a491c8