am 30a21ea3: Merge "Fix drawable location." into gb-ub-photos-carlsbad

* commit '30a21ea3356e87bdff0e072b840fa73215597326':
  Fix drawable location.