Merge cherrypicks of [2467803, 2467786, 2467717, 2467598, 2467823, 2467734, 2467671... rel-29-o-partner rel-29-r3-o-partner rel-30-r2-o-partner rel-30-r3-o-partner
android-build-team Robot [Tue, 27 Jun 2017 22:38:01 +0000 (22:38 +0000)]
Change-Id: Ia9c49bbaab83acc23a4c79e61622cda0398de743


Trivial merge