To make a clean branch of long_press_v2
minor modification
minor changes again
Merge branch 'long_press_v3'

Conflicts:
	gaiatest/gaia_test.py