Bug 883711 - initiative to separate gaia module for reuse