Merge "IllegalArgumentException in MagnificationGestureHandler"
am: 7aff46195e

Change-Id: I3822533c2d7d01c7d804cfd6ad914d36f5ef482f