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

Change-Id: Ibc08427e8de920f7f95a6a530b45cfcf8402d203
2017-03-01 21:37:58 +00:00
..