Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev