tree 97990bfc2d3aedf472182b32af0f33f52e0d6471
parent 7a50f285bd835fec6283b955b92f4dee91886f97
parent 619a498f73dd3330bad0edc6fa59cb54a8e8ddc9
author android-build-team Robot <android-build-team-robot@google.com> 1495829774 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1495829774 +0000

Merge cherrypicks of [2325207, 2325192, 2325307, 2325156, 2325272, 2325195, 2325326, 2325273, 2325289] into oc-release

Change-Id: Ic83e8db73eb0ca037369a997e4abdb633b8d8cfb