Merge "Fixed findValueLocked() so it fetches values from previous sessions."