[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 136eb4d05f  -s ours
am: 3a45366b5e  -s ours

Change-Id: If362e43ecb117cd13cdec35200306bc656dbf758