am: d978da5b Change-Id: I5f0552e86977f934bc36d1d6516d362adbf6df80 (cherry picked from commit 2b39a639)