Merge "IllegalArgumentException in MagnificationGestureHandler" am: 7aff46195e
am: f124c72600

Change-Id: I664ad0b3d09036bb2bbb0f0ce2e56d22ca042e7e