Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff4619 am: f124c726 am: 99317517" into oc-mr1-dev-plus-aosp