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

Change-Id: I4f0605d0d86c6f85c62f302b30ff774c34a956d6