Merge "Free memory when it is no more used"
am: b9de32f6f0

Change-Id: Iee890b48d57e0ec64512399d072bd6e048774282