Merge "SF: Remove a redundant write" into rvc-dev am: 48dc9323b3

Change-Id: I3e2f2811a02910bbcf322f77f10e3b883d5bb2f8