Override primary to set check mark in photo picker am: 972d093ca0 am: aac73c236a
am: 85d578c

* commit '85d578cf7ea1005eac7193fa5a989cb6fbd9dfee':