Merge "Adding faketouch feature." into honeycomb