tree 0e770228f769d1586bf5a6956d0420f85339533b
parent 47f5cfc7524b83a317c85b824c7478d2ed793a4d
parent ede8f95361dcbf9757aaf6d25ce59fa3767344e3
author android-build-team Robot <android-build-team-robot@google.com> 1511840076 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1511840076 +0000

Merge cherrypicks of [3276508, 3277765, 3277766, 3277904, 3276473, 3278009, 3278010, 3277767, 3277768, 3277769, 3277770, 3276509, 3276510, 3278011, 3278012, 3278013, 3278014, 3278099, 3278100, 3278101, 3278102, 3278103, 3278104, 3278105, 3278106, 3277800, 3276474, 3278015, 3278016, 3278017, 3278118, 3278119, 3278120, 3278121, 3278122, 3277946, 3277905, 3277947, 3277906, 3277751, 3278123, 3277752, 3278110, 3277771, 3277907, 3278095, 3277908, 3278111, 3277772, 3276475, 3276476] into oc-mr1-release

Change-Id: I4186238e8da78b3654baa0964d820e2ffc438f82