tree eab4a6e430be22bcefb2223db9c85c771b3dbe53
parent 968c247b9a651444be97a156dc62e55c5b66c0a7
parent 6d61113df40a6bc2914a855c1b3d479cda9a3a39
author Rick Yiu <rickyiu@google.com> 1539231457 -0700
committer android-build-merger <android-build-merger@google.com> 1539231457 -0700

Merge changes If834d0f0,I05ec75c7 into pi-dev
am: 6d61113df4

Change-Id: Ie4c3729fc1258f0f452fb57b6b345e873bfb440d