Bug: 8116902 (cherry picked from commit a2dffda3b3) Change-Id: I57c21681d5f94e00d0214fb520ea62af4ea5b025
a2dffda3b3