Updates for mr1.1

Change-Id: I8985aab7f32b18ce3e152908c35e7d00237ba114