Merge changes Id598ae1d,I475bd011

* changes:
  Fix a possible crash when the listener is null
  Straighten AIDL interface for the memory store
tree: 3a21d55cc319c7d92920020da8467c2af393dbab
  1. core/
  2. services/
  3. tests/