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

Change-Id: I4880c0347b0b5c511e6f09b24ebf2315c2b2b682