Ensure that we check the multi-instance property flag before querying properties

Fixes: 329530895
Test: atest MultiInstanceHelperTest

Change-Id: Ia9604366b0b0f7c5d4c3f44922b62226033250d5
3 files changed