Updates to bring inline with other variants

Change-Id: I8ba10db46a4deaf9a93125d11e65b37f44304708