am 212d6324: Merge "Fix show pics asset. b/10788522." into jb-ub-mail-ur10

* commit '212d6324456722af19798b9a7bab75bd1870fa26':
  Fix show pics asset. b/10788522.