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

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