Merge "expose systemAPI for SmsCbLocation constructor"