Bug: Issue 7763 Change-Id: Ib16a486efdd4e5bbf4c2f1c8f8d5cd180980e1c5 (cherry picked from commit a0bce874f6)
a0bce874f6