[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 1fc951b21c  -s ours
am: de53f696e7  -s ours

Change-Id: Ide10993798e74111a51bc18806abf6b84a2596fc