tree c4616f37bc9de857e0e9d3ccd26545f2e52ab20f
parent 8fc31b720ef9a2f37b3df82d78584d565eb304b6
parent d70ca88489aead6e67cfd1e8030d28c472d6add4
author Bill Yi <byi@google.com> 1540404513 -0700
committer android-build-merger <android-build-merger@google.com> 1540404513 -0700

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

Change-Id: I892b01bad7cd659aa7dd08f301c210e6f5b22d28