Merge "Keystore 2.0: Add convenience API for watchdog module."