Merge "Removed deprecated setExtras() method." into oc-dev am: 7c41ddb975
am: 5148d9fe81

Change-Id: I7981171fd6b6f0bb6c019f64f418a3348bebcdc7