Merge "Refine HidlMemory"