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

* commit 'd4bffda04d0ada80194417dd05d42b302b50feeb':