am cf0de02b: am 368a1f93: Merge "Store the key characteristics for operations"

* commit 'cf0de02b1530d8c219a5eda8f24a3114605c2dad':
  Store the key characteristics for operations