[automerger skipped] Merge changes from topic "getDeviceCapableModemCount" am:...
[automerger skipped] Merge changes from topic "getDeviceCapableModemCount" am: c6a8a641 am: dc6a7ba8
am: 007a179a -s ours
am skip reason: change_id I2a64309347407fb22d50bc93f61b9e6754a20cca with SHA1 388a42e8 is in history
Change-Id: Ia294bb9f506b1ce51f7cc56c63d8f17a02c162f2