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

Change-Id: I7a63dd4d785a3bc4e386cc10a427b12d678e7b28