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

Change-Id: Ib61d790c589642d2b2ee8b00e40a3221c5b24cda