Yuga config modifications for Mer

Change-Id: Ieb76f76b4c8636669915401f2cdafc8960832d1d