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

Change-Id: I5453d54e45385a03bae56a4742bcd680aff47356