Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev