tree 8abb946600f74db7ecf52becc50a9d3d48406631
parent faff8909937428d06ae22319b9234047e06a75e8
parent 6745ff5d231d59edac196b4f3d9aa43543741a57
author android-build-team Robot <android-build-team-robot@google.com> 1510254994 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1510254994 +0000

Merge cherrypicks of [3199316, 3199473, 3199281, 3199021, 3199022, 3199023, 3199317, 3199318, 3199319, 3199320, 3199455, 3199085, 3199261, 3199246, 3199335, 3199247, 3199209] into oc-r5-release

Change-Id: Ie067d54af9b12794cb13d43dadfcaed4ca7da135