am 61be90be: Fix b/11460582: Photos not rendering.

* commit '61be90be69b3489471a8f6927737e9c850ed8051':
  Fix b/11460582: Photos not rendering.