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

Change-Id: I793f3604a0185b19c63b3f9364623d9bfbbcaa04