[automerger skipped] Better handling of low memory situations am: 104d9eb5...
[automerger skipped] Better handling of low memory situations am: 104d9eb5 -s ours am: 3478f710 -s ours
am skip reason: Change-Id Ieb008e9f462d5f40fb65781d94cf116b1caf8446 with SHA-1 104d9eb5 is in history
Change-Id: I21c97e6b68cbe455897415460f42e2fb04ca3639