tree 4b936d836ca4787d999261cbc02784a1b6a668a8
parent db1762af35fdf68e2b896c02006af09ec3c8c01f
parent 2b4baf40dbdf1bf90984ba69ecf7553e331f2ff9
author Bill Yi <byi@google.com> 1540403309 -0700
committer android-build-merger <android-build-merger@google.com> 1540403309 -0700

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

Change-Id: I0c3ecf62577c863a1cb58dd5f5eccc568ed880a0