tree 50c77b1e69c50c8f039d99daab9745f549b300f2
parent afbb43f3ba2ae76d6cecead712b94bdca309bd96
parent 405164d3139722210e5dfac5ec8ca256e5e32f30
author Bill Yi <byi@google.com> 1540400017 -0700
committer android-build-merger <android-build-merger@google.com> 1540400017 -0700

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

Change-Id: I9df34cef5942c9f94b50b2eef1cf39a121b8ddde