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

* commit '165d43bc74ee3527b945695a4e57316a4a8a140e':