tree 322a5968015ba9bb25726f2db1c743b83d26d54e
parent 5fdb80059e6cb1ffb3590ac3415c9072c1a8b17c
parent 5025791ac6d1538224e19189397de8d71dcb1a12
author android-build-team Robot <android-build-team-robot@google.com> 1515094327 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1515094327 +0000

Merge cherrypicks of [3416661, 3417182, 3417738, 3417739, 3417758, 3417360, 3417361, 3417362, 3417363, 3416401, 3416402, 3416403, 3417778, 3417798, 3416662, 3416663, 3417799, 3417800, 3417364] into oc-m5-release

Change-Id: I61799fada6cf751fc71ed0e43294b02e59b35b4a