Merge changes from topic "evs_memory_management" into rvc-dev am: ce6f4b0676

Change-Id: I99528a568960a4ec6ce4461a7393d5abee653f50