tree 60a258723a9585736991ee2948246f5214300a7a
parent bdf5086a65f5f731ba4ab08ea45b26bfb068d7df
parent 17bcf316e0f0400d18c62612578d3cc374cae2fe
author Bill Yi <byi@google.com> 1540399561 -0700
committer android-build-merger <android-build-merger@google.com> 1540399561 -0700

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

Change-Id: Id895b2184f14ac2907cd7f1544db37d49e950ce8