Add missing changes

Change-Id: I73aa301a8646fb4686185328bafba69d00f2d4d1