Adding back missed changes

Change-Id: Iafb6f25ed77a01905a58d2d4d7abba032c1a4be9