Merge "Straighten AIDL interface for the memory store"