Merge "Remove @Nullable annotation from getDrawable() methods" into nyc-dev