Merge "Add keystore permission for metrics re-routing." into sc-dev