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

Change-Id: I322fdf688a0d78c090db27a4c0fb6c32152a231c