tree f5be3cff58cf5d75398b2ad0d556e5531027a344
parent edbafe794f9638de61500ea2c299e8bc62a7562f
parent 049bb224280d31cf2f9c1ca62226c8eb3b7110d5
author android-build-team Robot <android-build-team-robot@google.com> 1498251251 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498251251 +0000

Merge cherrypicks of [2454758, 2454859, 2454837, 2454965, 2454984, 2455001, 2454760, 2454860, 2454838, 2454899, 2454970, 2455005, 2455027, 2454973, 2455006, 2455061, 2455007, 2454914, 2454987, 2454974] into oc-release

Change-Id: I553bda5e86663208d37cf5dd37c25a82269f6577