Merge "Replaced private com.android.internal.R references."