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

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