Merge "Keystore2 Metrics: System server rerouting" into sc-dev