am 25df2a98: am 6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread

Merge commit '25df2a980d87f011fe702b6209c3b71b2824fc18'

* commit '25df2a980d87f011fe702b6209c3b71b2824fc18':
  remove remaining refs to max_image_sizes