am 543a4d90: am a2988bd0: am 3ecab41b: am f7443794: Merge "fix CTS issue for case testSetOnScrollListener" into jb-dev

* commit '543a4d90bd03998355c2f10f651efedad458a147':
  fix CTS issue for case testSetOnScrollListener