tree 04591a8fa718219f83f813044db76134e8f7a814
parent 0fd8d51856b74d947cd788131869c4d8de940697
parent cdcb64c24ff32c276a0f210b1ff2f5e5833bd802
author android-build-team Robot <android-build-team-robot@google.com> 1501106445 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1501106445 +0000

Merge cherrypicks of [2605310, 2605311, 2605356, 2605305, 2605434, 2605435] into oc-dr1-release

Change-Id: I36168cdf3a15af58ab7e27ead5cc754f994b87e1