tree bb12ae2b3ee132d28be27f00f17ee99f231e58ee
parent 0dcb748cdd08261032b44727b1f1b20fce17f0d7
parent 1822961a6194b65fa85b24a242a0ffb15797fc8b
author android-build-team Robot <android-build-team-robot@google.com> 1508186661 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508186661 +0000

Merge cherrypicks of [3074405] into oc-dr3-release

Change-Id: Ia2cb71fc1d5a647a565c6311ce80f1de08e905db