[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 5f5185f86c  -s ours

Change-Id: I8a3226f054133b5cb24160832da164596c5d621a