Merge "Perform network search using the default sub id" into lmp-mr1-dev