Merge "Added slot index version of getNetworkCountryIso" am: 4d854986f3
am: 77793b1d49

Change-Id: Id915b8e62398beaa2ffdd943ed16df498ccc6d59