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

Change-Id: I9561fe4a350cc651e34f599eb83ffbd28ec0650a