tree efd6e004377e585a434c7da0967bffb0a5b7d2b0
parent a7cf4f566dffbb14572a650298e63bb9fe6b9d57
parent c5804720aa471b5959039960e1bc3ecbd10cbc89
author Bill Yi <byi@google.com> 1540403260 -0700
committer android-build-merger <android-build-merger@google.com> 1540403260 -0700

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

Change-Id: I08a9fdc0f8e5ef6f101ba5d247defc38c4659719