Sync OOM with cm-11 branch

Change-Id: I88161291ed76c3a8055046faa81bc2f470af6a0a