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

Change-Id: I74a380e55a5825ad7e349b9838225d744a61ebe3