Merge "Store keys instead of notification entries." into udc-qpr-dev