tree 94cbae2592571a40f4118939e79a7afde0d5eb9b
parent e62c0cec8c6ff36a1f8f2fd4f5c9aff6c431058d
parent 568aba3bcced2cbd989e8fac8a3279819c862d6d
author android-build-team Robot <android-build-team-robot@google.com> 1513210781 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1513210781 +0000

Merge cherrypicks of [3359449, 3359642, 3361564, 3359450, 3359451, 3361565, 3359507] into pi-release

Change-Id: Ia692c5043a476dfd669e6f9020c246764a1d6536