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

Change-Id: Ica34198b9d0d3bb9bd248abed3ab814255661a65