[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: df90f793f1  -s ours

Change-Id: I56e6f8efff18414b601f527415ef77dfb933429b