Merge "Fix AvatarPhotoControllerTest." into tm-dev