[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: fe4512e2 -s ours am: bfed746e -s ours Change-Id: I2e6cff50044c64e74e409ca522d44dd4d02bddbb
mentioned in commit 85cee730