Different Singleton

Change-Id: Ib09ffda7237077bc66b8c3e982c70722a50373cf