Merge "Merge "Removed deprecated setExtras() method." into oc-dev am: 7c41ddb975 am: 2f8647c4d1" into oc-dr1-dev-plus-aosp
am: 1072b62b15

Change-Id: I532d77e0780f22afcda16b1809821113a2db8be2