[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 1118a8c6e3  -s ours
am: 3c641f4801  -s ours

Change-Id: I86544e3f815990b229c8d90561ee5abf9c357251