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

Change-Id: I644aa9f30dcc95d376f3d76d4ef0530ba2750b82