Merge cherrypicks of [2374621, 2374525, 2374320, 2374526, 2374587, 2374550, 2374624...
android-build-team Robot [Thu, 8 Jun 2017 00:37:00 +0000 (00:37 +0000)]
Change-Id: I3eb39ce6323e504acbe6e61086c62465ccd5b3e2


Trivial merge