am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev

* commit 'b2ae0d6f320d6f11f31cc82b03ac0fdf36220cc1':
  Fix an incorrect behavior that failed AT&T privacy test.