[automerger skipped] Merge "Fixed consistent issue for subId in...
[automerger skipped] Merge "Fixed consistent issue for subId in dataConnection" am: 421e974a -s ours
am: c294f7ee -s ours
am skip reason: change_id Ie25ee7a7e7227de3c57a297cd0e8367c85bcccba with SHA1 cbc64458 is in history
Change-Id: If038f2bbdc54f15abb8afe9af2ccaa4d5a8420f6