Refactor key and operation details.

Change-Id: I80267e6184955ecd98b08ceab91f4afd50c67614
16 files changed