Merge "Rename keystore methods and delete unused permissions" into mnc-dev