Merge "DO NOT MERGE: Treat unknown tooltype as touch. am: 0c28f3bda3 am: 6c06272a12 am: 50293dffb1  -s ours"