tree 8abb946600f74db7ecf52becc50a9d3d48406631
parent 26cfad5c8b0764583d5854a099275478d286fe65
parent 4d885746554d875376e66cb622a73e3982adc76b
author android-build-team Robot <android-build-team-robot@google.com> 1510180899 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1510180899 +0000

Merge cherrypicks of [3192228, 3193161, 3192849, 3192850, 3192851, 3193150, 3193193, 3193195, 3193196, 3192852, 3193233, 3193234, 3192311, 3192312, 3193273, 3193218] into oc-r4-release

Change-Id: I88aeb341816aa6d672f8ea16a84a6db1e96db3d2