Merge "Make sure we keep Annotations in design's proguard" into mnc-ub-dev