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

Change-Id: If4cf279e8fea0ee3653410bb94cba1cb89a60890