am f314c2f8: am fb81f541: am 8c4e8825: am b99df3a1: am 733a5e82: am 431eb471: am e5eac95b: am 8b8e40d5: am 881575a3: am 543a4d90: am a2988bd0: am 3ecab41b: am f7443794: Merge "fix CTS issue for case testSetOnScrollListener" into jb-dev

* commit 'f314c2f817ac4a85dc6981da492f2e87f59029cf':
  fix CTS issue for case testSetOnScrollListener