tree 98cc0e4bd8fc52b8e714acd1c55cde260a0d61f4
parent 878d86fe3c9240a3acbaa93927167b88d813a4f1
parent dee776ab6ce24dc979fa9074b08be2ad96c727ca
author android-build-team Robot <android-build-team-robot@google.com> 1505519973 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1505519973 +0000

Merge cherrypicks of [2912137, 2912209, 2912210, 2912151, 2912152, 2911092, 2911093, 2911094, 2911095, 2911096] into oc-dr3-release

Change-Id: Ie95b996dcb1b35bcc65b79b12244ef640a9659af