Merge "Get the resources associated with subid to support MSIM" into qt-dev
am: 261b3b13b0

Change-Id: I14653491f947897d82f0550f315380b2a473379d