Updates to bring inline with other variants

Change-Id: I10eb29f2a925fba2f92e85964dcfcc2e3042b6a4