Bug fix on site ids + Branding 1.0.7

Change-Id: I2ffd9ea8267de3cdf23994578c99f9930fc38741