tree 94536b3829513e023c931701a2fedcd50d394e35
parent e2c83781d65587d4a3457538d3f1627c5805ab43
parent 6e13edf7a18a3e2a0b30b9e3b9d88f123b898275
author android-build-team Robot <android-build-team-robot@google.com> 1533663806 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1533663806 +0000

Merge cherrypicks of [4709054] into oc-mr1-iot-release

Change-Id: If6d9ca7ac9c382ac8aadb3ca71dc24158b11080d