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

Change-Id: I6f7ae9e7868ba838e5047af468a67b6c9fd7cbee