am d3d5b033: am ae268392: Merge "Revert "Fix adjustViewBounds handling for...
am d3d5b033: am ae268392: Merge "Revert "Fix adjustViewBounds handling for ImageView"" into jb-mr1-dev
* commit 'd3d5b033':
Revert "Fix adjustViewBounds handling for ImageView"