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

Change-Id: I0a9dbba6c94e4ef9dd36d7a7d43a0c36005f47c7