Merge "Revert "DO NOT MERGE ANYWHERE: Add findPath API to SAF.""