tree e0df58c6609831d33e23f47e8c1678fc2c324b36
parent d57d9976cd0eec76592f25a83aba2319a898ea74
parent 6c3324a3b48c7b535ddfd5f864abfbfe18d58b1f
author Bill Yi <byi@google.com> 1540401721 -0700
committer android-build-merger <android-build-merger@google.com> 1540401721 -0700

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

Change-Id: I64d3307c76273b6117141196c24fff8310825056