[automerger skipped] Use the SubId in the TM.getNetworkType if Valid am:...
[automerger skipped] Use the SubId in the TM.getNetworkType if Valid am: f36fee3c am: 7fae515a -s ours
am: b06f2715 -s ours
am skip reason: change_id Ice4f673750ab3b374644750113e5b9b2a4f5ba63 with SHA1 0aca4313 is in history
Change-Id: I49f790294727e654c96cff1459a09761a88ff621