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

Change-Id: Ie1fb8e447fdf19a6bb7d0ecd24d36da1d1147934