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

Change-Id: I8cbe55be9363d58f27447100f7d212577f3295c7