tree b0f1240a559e1d42530696e33a87ebceb8e09ad0
parent 61c047282f9ceae56ce8b750ceca522942863941
parent 59c36677da7c31748ff5d3c1c1ce5923cba334c9
author android-build-team Robot <android-build-team-robot@google.com> 1506104145 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1506104145 +0000

Merge cherrypicks of [2944626, 2944869, 2941173, 2943653] into oc-mr1-release

Change-Id: I74fd4a10cd42d77bece97dff800f3b5beef5d17c