tree f54b7017b02dbf742fefc7fb1148573e4745f1cf
parent 569dc60799f086aa30d95dff0be31fd4df46cf0d
parent 5eeab92611221e136ffec6cdd3f7063ae2633a70
author android-build-team Robot <android-build-team-robot@google.com> 1504643552 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1504643552 +0000

Merge cherrypicks of [2846958, 2847366] into oc-dr1-release

Change-Id: Ib5be897ddc095597fc05d10b1d14e1a97d674737