Merge "Add @Retention annotations in ContentRecommendation"