Changed the configuration to address overload scenarios of the End Users.

Change-Id: I42f560eddec6c901d620fac2133e7e74b20e3a68