Merge "Support for multiple instances"
am: e97dfde326

Change-Id: I4dd8a5018e2cec479f1d5d304f220992e0f37e39