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

Change-Id: I27eec7a4488a72a5ef54e158d22a50ddf2e13af7