Merge changes I7d2b7e50,I784406a6 into oc-dev am: 76831f7e39
am: 085abab5ba

Change-Id: Ic5e4a29f2b81aac05cf53b99190e92989163e412