[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 829ea1ae4e  -s ours
am: 77e59dd49e  -s ours

Change-Id: I37eecb71e1069f1a9c17bd4a35616e54db3b7c29