tree e2160ee2cfe79639bc9eed6a99c728f761fd26e2
parent 45fcb14b365217a32c556828c30606a96301bfbf
parent 32aafab6966944f1aae7bea077818d038680c1c9
author android-build-team Robot <android-build-team-robot@google.com> 1508180354 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508180354 +0000

Merge cherrypicks of [3072908] into oc-r3-release

Change-Id: Ieb85c3d19bd579246b924b44f5f2ebe6af8dad34