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

Change-Id: Iebda7471bcff007c88f2cb67472c914988337e33