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

Change-Id: I6331cacb9e2e48dc92fd7c277555cff9df8a5c89