[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
am: 77b4f77bf9  -s ours

Change-Id: I4be7cee76dbd288f4bdb8f21ba1ed156edd2cb89