am f98a800f: am 9e9c892a: Merge "Fix CTS use of bind"

* commit 'f98a800f71d7e9e054a807b0eece5bcaaf5aee06':
  Fix CTS use of bind