am daccbc0a: am 1208e343: am 2f902959: Merge "Make keysetmgrservice gurantees explicit." into mnc-dev

* commit 'daccbc0a3c34808d5818f2e754b60731c803a14c':
  Make keysetmgrservice gurantees explicit.