Rest of phase1 to 1.23wmf9

Change-Id: I2c2836d402f8e5c9a68231cef7c8d2d7930c9d45