tree 3ea0b3c131f04b4ea217bb3de152a6b267e4528d
parent 209ce3d05b04163feaee58d64164391d283a798b
author Hansong Zhang <hsz@google.com> 1549071930 -0800
committer android-build-team Robot <android-build-team-robot@google.com> 1550161475 +0000

resolve merge conflicts of ec78d74706c3e81f91eee53e3d9f959f66e5d77f to pi-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id658b3485fdc0025bc44850be9f23bb2d2146d9b
(cherry picked from commit 6c0f22f324ed0bdf9dea3e803e5ee6176d03fdb4)