Merge "Remove constraint on touch location." into oc-dr1-dev am: d8fb01fe77 am: 9393de424b
am: 857abdb88c

Change-Id: I02da92155ed2c80375c465a47be56feaf93a4783