Merge \"Update semantics of on-body Keystore API.\" into nyc-dev
am: c152fc15a9

Change-Id: Icf116ed3d722eede02e743a4559ff684a36a82e0