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

Change-Id: Iff0c951c0a1e27f6285f994df3a6f40c9a3bd8e3