[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: d79e4d0d14  -s ours am: 0c23c6d5e5  -s ours
am: 505b49934b  -s ours

Change-Id: I478e43b1a3ea252a68c1a9b3a2db8bf8800bc0b6