Merge "Handle user privacy properly during network initiated requests. Bug: 16131208" into lmp-dev