Merge "Rename READ_MEDIA_IMAGE to READ_MEDIA_IMAGES" into tm-dev