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

Change-Id: Ieee2431adabfd9b5d7be2854d88e8852f4899d2f