Merge "Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()" into nyc-dev am: 49a1c08
am: e760bc7

* commit 'e760bc7c541c5e333f275d446c8725d370c75e9a':
  Rename enableAutoJoinWhenAssociated() to setEnableAutoJoinWhenAssociated()

Change-Id: I83d5716166bb39a88698ea1922e343e58f6dd04d