Merge cherrypicks of [2686880, 2686702, 2686703, 2686704, 2686141, 2686142, 2686143...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 8 Aug 2017 18:46:02 +0000 (18:46 +0000)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Tue, 8 Aug 2017 18:46:02 +0000 (18:46 +0000)
commiteae2956a429437557721b2b142431143da731cee
treea2bb985ae82a870b24396367d2bf37d4b0f86c68
parent4b451a2466304077bc0953c2b7b34d23372ec676
parente454bab98283d8ac0c6ecc795a101dfa8ef6f000
Merge cherrypicks of [2686880, 2686702, 2686703, 2686704, 2686141, 2686142, 2686143, 2686705, 2686706, 2686707, 2686782, 2686783, 2686784, 2686785, 2686786, 2686787, 2686788, 2686708, 2686144, 2686789, 2686709, 2686710, 2686711, 2686712, 2686713, 2686714, 2686715] into oc-r4-release

Change-Id: Iafad31ecbb46bcc953c21be6fbbe4053eb150636