Merge changes Ibc1444b8,I14c200d1 into oc-dev am: fd43dc6723
am: eb444d602c

Change-Id: I5c01a250bf9422b23210fc6860676c60ed33c172