Merge "Fix edge case crash with invalid bitmap dimensions. am: f9e79e04 am: 616a2a15" into nyc-mr1-dev-plus-aosp