Updates to bring inline with other variants

Change-Id: I3ac805b840b1986ddb9459ea3b2d02908720a3e6