Merge "[CTS] Fix oom catcher to remove false positives" into oc-dev am: 2b552bf7d6
am: 18511c1db2

Change-Id: Id0b7fa7333e3c40ec6b5e60ab303608a39d06e62