Merge "Make keysetmgrservice gurantees explicit." into mnc-dev