tree 734c3884297ca2730760c48e917a52c66bc3dfba
parent 4b451a2466304077bc0953c2b7b34d23372ec676
parent 1a9aaecfd7cd2614446eac20fd9c1f86d1bb2300
author android-build-team Robot <android-build-team-robot@google.com> 1502151488 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1502151488 +0000

Merge cherrypicks of [2680667, 2680866, 2680867, 2679663, 2679664, 2680868, 2680869, 2680870, 2680668, 2680669, 2679480, 2679789, 2679790, 2679791, 2679792, 2679793, 2680914, 2680915, 2679481, 2680916, 2680670, 2680671, 2680672, 2680673, 2680974, 2680975, 2680976, 2680977] into oc-r2-release

Change-Id: Ib9a928363fe60b83c354f64484faf2a59541c9af