Merge "Use installed keystore alias to check if enterprise config is insure" into rvc-dev