am 7d4371a4: am 70b692a8: am 2189be66: am 4468a20e: am 8ae468e8: am ba1be325: Merge "Fix CTS case testScrollTo." into jb-dev

* commit '7d4371a4cfc0ae4fa28252b0961531ec0c27dd0b':
  Fix CTS case testScrollTo.