tree e76bfdc5a7612a1f7c21a54e5394c8aa5613185a
parent 03f522f43fdbd7882550d43fb18a0fc7c5970cce
parent 317e5f1d751cdd3796340d7bbffe80695d5d13d5
author Bill Yi <byi@google.com> 1540399389 -0700
committer android-build-merger <android-build-merger@google.com> 1540399389 -0700

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

Change-Id: Id2c7871e6b5689e9f45e9384060fcf7f8b1db4b1