Merge changes Icc9c36f7,I723474e2 into oc-dev
am: 07525d4f25

Change-Id: I84d476d21e920fdd28e8e1f7c18d54d3eaf1e23b