Bug: 6079494 (cherry picked from commit 5fb53f36cb) Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
5fb53f36cb