tree 05330ae0fe147304300b4f592e6f41ab85f96ff6
parent b09160c1366256416bb3b55839986847c06bb283
parent cbe03d98fe0a28971cfe891bb8a7e225a2c07d0b
author android-build-team Robot <android-build-team-robot@google.com> 1508388914 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508388914 +0000

Merge cherrypicks of [3094267, 3095329, 3095257, 3095367] into pi-release

Change-Id: I5bfbf0e26a0e9229f26c34da8960a2ad5b0a3829