Merge "Backport upstream r1246." am: 3e861c24de

Change-Id: I9bdd9951b2607afee045c1956332dc032aaec8c0