Merge "Add tests for new Drawable APIs" into mnc-dev