[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 4407e3338d  -s ours
am: 22f1ea0d3f  -s ours

Change-Id: I946ffeba3fc272e65970b119e58369c03c4289d6