tree df5002817ff3dccadf02acdfc0c0377575363479
parent ed50f647f72f0fd7a9a39dc16d5167565af91233
parent 8c53c6e4e3ef6d85d81af1ca0348f521c9cf0f8b
author Bill Yi <byi@google.com> 1538374671 -0700
committer android-build-merger <android-build-merger@google.com> 1538374671 -0700

Merge changes from topic "am-4f2d7404-9a6c-4f5f-9d17-25f79c4505ff" into oc-dev
am: 8c53c6e4e3

Change-Id: I64b06a863a95707eb9d5ef1db4cd5f5b2c70000b