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

* commit '8b8e40d5f27a8439bb65281164bc270ca18a3088':
  fix CTS issue for case testSetOnScrollListener