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

Change-Id: I298fb174dc62a6c02478597fb4b0b869eb61d94e