Merge "Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e am: f124c72600 am: 99317517cb" into oc-mr1-dev-plus-aosp