Merge "Revert fwalk/sfp locking to fix concurrent reads" into qt-dev
am: 2a24f6bd5f

Change-Id: Icb6f156e1ed44e66e9f660d143b5b767852e4992