tree 26f25742c83ffcccf2080d73f380ff8328e1f93f
parent 3abb60480dbb03fb7aa3521f278ac4d8d3ca4410
parent 2bad032c0e47dff091fa538340f3461f415a116f
author android-build-team Robot <android-build-team-robot@google.com> 1502151498 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1502151498 +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: I95bbab927d7950002f8831f44c2abc0f76c8bcda