Merge "Remove unnecessary @TargetApi annotations"