Merge changes I0ff1fc5c,I7a23d3bf into oc-dev

am: a7172f41b8

Change-Id: I666faf401fb86b4a74c610abfc39b673b103856b
This commit is contained in:
Josh Gao 2017-05-13 02:27:26 +00:00 committed by android-build-merger
commit e9fbe99ba6

Diff content is not available