Merge "Remove the dependency in token storing locations"