Merge "Improve HidlMemory annotation"