Merge changes I0ff1fc5c,I7a23d3bf into oc-dev
am: a7172f41b8

Change-Id: I666faf401fb86b4a74c610abfc39b673b103856b