1. Integrate Web Core infra changes
2. removed white spaces

Change-Id: I99d5661f79106966393f3d4e92f6b64e4b6b077c