[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 -s ours am: 78e8ea47 -s ours
am: c321e7df -s ours
am skip reason: change_id Ice4f673750ab3b374644750113e5b9b2a4f5ba63 with SHA1 f36fee3c is in history
Change-Id: I6a135d0436d6835af1c63fe33134b71f8f1bb1c8