Merge "change getString/Drawable return value annotations to @Nullable"