Merge changes from topic "getDeviceCapableModemCount" am: 8ed3fb4bcf
am: dd9d9fde68

Change-Id: I48303451f2ad1eeab2513ac5994de2b97649d82b