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

Change-Id: I7bb296798e351997839e47bb18ac49ed7e0d2b35