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

Change-Id: I9cce740f777f0c881b37cbf4752cd81d7f817a41