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