Merge "update OOM for 2.1.6"