am 2e35df06: am 4984ec72: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev

* commit '2e35df06e795e89af66850a9e12d9b1c53f9a53d':
  Fix adjustViewBounds handling for ImageView