Merge "Memory pressure" am: c7d0028ac2
am: a4e7af5980

Change-Id: Ic35727f6c6fcc5e9c7c1c6b9646e77a6a9bfee56