Bug: 6064760 Change-Id: I3fd833a3205be451ff6548fab3555d170c9c570e (cherry picked from commit e1693df494)
e1693df494