Merge "Remove redundant secure store accessor methods"