Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
am: 6a6d63be45

Change-Id: Ia0425e5333b437970786255b0a1e513fedfcf0bd