Merge "Clean up Drawable annotations" into nyc-dev