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