Merge "Fixed an issue where isFalseTouch could be queried" into oc-mr1-dev
am: efeb2cf943

Change-Id: I3e46e13d5e84a5e45849ca15d716486f1032bc4f