Merge "Get the resources associated with subid to support MSIM"
am: cdbb700fa3

Change-Id: I72a04a209bee67c37d4349ca6638f443718b3693