Merge change 21929 into eclair

* changes:
  Fix device address check when profile state changes.