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

Change-Id: Ib39d27ab77f22ba45e0a287154bdb5843410bbb8