Removing changes not meant for MR1

Change-Id: I553ab453ed1e22dd2c144c8e4965804c4f191f62
1 file changed