Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev