Merge changes from topic 'query-fplmn-sync' am: 0dc62c6dd3 am: 1f7f262920
am: 3243ec0614

Change-Id: I3da03980792e5fa898b7109dbb2cea7147f7ee94