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

Change-Id: I3ca458f7b531fe3fb98c5044395768b293138904