tree 00aedc755d59955c8cd69dca9f66bb2bdb51cc05
parent 4f7d3757322df2888e3c1375a26f626dd76b24df
parent 359e41ca9e6fd734ea43e0c82d1c3432cfc31cb6
author android-build-team Robot <android-build-team-robot@google.com> 1499813732 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1499813732 +0000

Merge cherrypicks of [2524909, 2524910, 2525349, 2525350] into oc-release

Change-Id: I582aa867aead714f14d18d1d9b0fa43299c8a0ad