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

Change-Id: I9b8ad92792978bb0eddca3ffe7688f366b95d7e9