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