Conservative Updates

Change-Id: I49a280326aa528b192ae01c5fe1455edc2fa6fa5