Merge "Update semantics of on-body Keystore API." into nyc-dev