SF: minor fixes

Follow up on change id I347b2cf57f1df426d11d07a84075419597d4a442

Change-Id: I40e820492dcee0374b86c98b651d1415bab8be8d
Test: presubmit
2 files changed