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

Change-Id: I9c30e65127c5148dc58c45f27ddbd4f70a284aa3