Merge "FLAG_ONE_SHOT is not guaranteed to update the extras." into cm-10.2

Change-Id: I74a380e55a5825ad7e349b9838225d744a61ebe3
Remove unused stuff.

Change-Id: If733fef2e11349c7d07d36c476521f26916a0318
Remove debug leftovers.

Change-Id: I8d800829fe2f404810575d767cff864cf74cc80b