Bug: Issue 7555 Change-Id: Ifd76847baa7a1042a090c46bb6762511ecbe172f (cherry picked from commit 5e8b7e7299)
5e8b7e7299