[automerger skipped] Merge "Get the resources associated with subid to support MSIM" am: cdbb700fa3 am: 302b8e8cfe -s ours
am: e499d9f43c -s ours
am skip reason: change_id Ib00cfe3640b59db5f971c32741eed999131e67c0 with SHA1 ea6d2b1e1e is in history

Change-Id: I2971b0218b1ca82b63145fda3f9e08e718931e45