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

Change-Id: I904e81090aac7995d18c9e48974c082d42e80b81