tree 19d2082c959f0fffe1039d3876ee79d5c0e2bd15
parent 7d951867416234a6f3228eb9d888009184b1d0b7
parent 532673222decc40b3179e18886b4247c3b9fa88d
author android-build-team Robot <android-build-team-robot@google.com> 1503514179 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1503514179 +0000

Merge cherrypicks of [2779825, 2780206, 2780207, 2780102, 2780103, 2779826, 2779827, 2779722, 2779723, 2779973, 2780208, 2780209, 2780210, 2780211, 2780212, 2780213, 2779703, 2779704, 2779705, 2779706, 2779707, 2779708, 2779709, 2780214, 2779828, 2779829, 2779454, 2779724] into oc-r3-release

Change-Id: Ic3903f1b98d5c67903378914c731556d3753fb62