am c2d53b5d: am e9e72c5d: am 72e5ff84: am cf8433a8: am ca496ada: Merge "Fix CTS testTouchEvent for watches." into lmp-sprout-dev

* commit 'c2d53b5d408392f7461502d67e66f03c67162c95':