Merge "Revert fwalk/sfp locking to fix concurrent reads"
am: f61ca22248

Change-Id: I2c9daf5835ba4a1d1d317f647a0192771244bba6