tree 84b51492d442774e277e7e1e367aa35154322205
parent c92a468619bdde2f453862ff1fedbe8dbcb969bb
parent 0e22eb8d80068beca156cb44bcba835ce50afb25
author android-build-team Robot <android-build-team-robot@google.com> 1498795852 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498795852 +0000

Merge cherrypicks of [2481491, 2481800, 2481782, 2481665, 2481547, 2481358, 2481802, 2481613, 2481668, 2481614, 2481594, 2481595, 2481548, 2481744, 2481493, 2481494, 2481709] into oc-release

Change-Id: I7dbe587a8e4fec711e67e974a8caf0351bd0c9bf