tree f7584ce9f33a07ee6c7349e578e07ce235275d83
parent 91c5f0c8db1856c53153957106cc4ee2c96f7f84
parent ccc5e7d6d2a459d04dbb007268edc2b1d0e3e39d
author android-build-team Robot <android-build-team-robot@google.com> 1516387879 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1516387879 +0000

Merge cherrypicks of [3484108, 3483651] into oc-m2-release

Change-Id: Ied8deb31e77aadd4512fe896863f854566299434