tree dc2a198039c92838700a859bdc4fc4772289d898
parent b2aa74715699108f371d5479afb86f44e881e29d
parent 5d6ca0f012638995b423fa441626e843a95cf98a
author Bill Yi <byi@google.com> 1540404920 -0700
committer android-build-merger <android-build-merger@google.com> 1540404920 -0700

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

Change-Id: I59533137ee7939fecd9aa977df7d0eb59b2616f4