tree 9d5d8c98144e35c8637b99b731a5a0340de4580f
parent 4ec0ca5336a657cd8e4d92c437ce8661a1eafbda
parent 4d58eb3bc17d488a187007b8dd105de9d7dce949
author Bill Yi <byi@google.com> 1526606090 -0700
committer android-build-merger <android-build-merger@google.com> 1526606090 -0700

Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a
am: 4d58eb3bc1

Change-Id: I9bdbdaadbe40bba74e9ca9186e88d6881c25e022