Merge "Workaround discarding of @Retention(SOURCE) annotations" into oc-mr1-dev