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

Change-Id: Id74b4becd0f26d185cad3ecbe539aaa69f7ac89e