Merge cherrypicks of [2686880, 2686702, 2686703, 2686704, 2686141, 2686142, 2686143...
android-build-team Robot [Tue, 8 Aug 2017 18:46:02 +0000 (18:46 +0000)]
Change-Id: Iafad31ecbb46bcc953c21be6fbbe4053eb150636


Trivial merge