tree 924fb009af2d68b4a7609241a133dbdae0550016
parent c59fd8071281e091311d1284bc84ee104ba98c13
parent b6b9a1d4d3787711e5b521a4b7cdfff0e593efd2
author android-build-team Robot <android-build-team-robot@google.com> 1493419712 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1493419712 +0000

Merge cherrypicks of [2124296, 2155718, 2124142, 2178857, 2155534, 2160720, 2170601, 2179123, 2171399, 2179577, 2179404, 2179182, 2179403, 2179139, 2157713, 2179479, 2163166, 2174534, 2175376, 2178877, 2171391] into oc-dr1-release

Change-Id: I0aca01fcd85c0201980ddeca0cbd7eca0e6e4a4e