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

* commit '72e5ff84b85c0d3dbefba4f2d911cfa64f0003b2':