Merge changes Id598ae1d,I475bd011

* changes:
  Fix a possible crash when the listener is null
  Straighten AIDL interface for the memory store