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

Change-Id: I37eabf5e38179537510f204fe6bf397399906566