[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8e228fc8be  -s ours
am: 40e71f7952  -s ours

Change-Id: I5b3358deffad9a0eb7ac34b1ca80a01c2c7279ab