Merge "Fix for ContactsContract_PhotoTest"