Merge "Support for multiple instances" am: e97dfde326 am: 438487eb3c am: 977a61cb96
am: 8acc99e23e

Change-Id: I32f65a5294bcf008aab4df1ae73b44d683ae8a51