Merge "Remove constraint on touch location." into oc-dr1-dev am: d8fb01fe77 am: 0f6c276edd
am: 30ada17449

Change-Id: I4df5065cef24a42f1cddf9b3c25e1899d478fc4f