Merge "Support for multiple instances" am: e97dfde326
am: 438487eb3c

Change-Id: I4df6c57fa1d4863b26a10d10cbf8c6be107a07f9