Merge "Accessibility scary dialog for android R changed."