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

Change-Id: Ice204340ffe9c2eba6fde4ccb133a9a96510cd25