Merge "API Review: Drawable" into mnc-dev