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

Change-Id: I56555d7da92da111547b3c38e1cfe6aeeacc1073