tree 0aa73e1d4d1dbd132ad063a4aabd9c9ce8f7b6b5
parent 9abda38125bc55ca9fe33879a35db09c8f2abfe7
parent 94b17e9a3576f5b07a9881267e799eb03f32929b
author android-build-team Robot <android-build-team-robot@google.com> 1499067417 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1499067417 +0000

Merge cherrypicks of [2489285, 2489286, 2489323, 2489399, 2489257, 2489326] into oc-release

Change-Id: Ie5ff5184b49e46a20cc74570095e1a5363c1c9ae