tree 2d1c4c1cbe20b077701f5982152717ff2462b5df
parent 4093b47bf64b738bc6aee39857e214f899c857cc
parent 06afd21d793818c24c7a359f782c33a42ab08a70
author android-build-team Robot <android-build-team-robot@google.com> 1500594897 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1500594897 +0000

Merge cherrypicks of [2572523, 2572535, 2572536, 2572469, 2572470] into oc-release

Change-Id: Ib1bdd5bfd64e3b3f85d864270c1ff688da4df672