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

Change-Id: I90c7f24df86adae08b57b5f26a82722d99d762e5