tree 24de2ff5a3e33e56ee4d161fc04c9f56ca6044cb
parent 83ac560d834c428837cf82723c6dd8ed4ad3daa5
parent 949e23ddfa0282a95aba62ec3bc8af6dbb4f1420
author android-build-team Robot <android-build-team-robot@google.com> 1507140733 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507140733 +0000

Merge cherrypicks of [3012829, 3012750, 3012751, 3012600, 3012601, 3012602, 3012603, 3012849, 3012850, 3012869, 3012870, 3012871, 3012872, 3012873, 3012630, 3012631, 3012632, 3012633, 3012634, 3012752, 3012753, 3012604, 3012605, 3012606, 3012929] into oc-r2-release

Change-Id: I486b6b80d37cf01ed31c66242e06f2510d0921ff