tree c68f51cb2b23e1ac3f149b0d4eec1366c639c66b
parent f399c2f61d0ae605a93c6a5760b9d60aa6c3fbd8
parent dbb993b80ceadd7dbb63e0505747b698b6817b67
author Bill Yi <byi@google.com> 1540401174 -0700
committer android-build-merger <android-build-merger@google.com> 1540401174 -0700

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

Change-Id: I1ba13750b51dfae5b6fe1664c9c7c862ad48818a