Merge changes Ieb58dd9a,I8ada38df into oc-dev am: dd4cdfd30a
am: 04299e0ba2

Change-Id: I8dc329c12f38eb98bc5b1e4cdc73d7ad37106249