g2: this isn't CM !

Change-Id: I89063d601ebfd9a774cd17aa799002d3fdfa13cb
g2: update TapToWake for nameless

Change-Id: I9f597a02fc3c27d1a4e1645155a616d192d2f39e