Merge changes from topic "am-1ff48321-da99-4127-9191-368aa5f100eb" into oc-dev

* changes:
  [automerger] Modifying test to fix OOM b/38045794 b/72326145 am: 6eddd9bd48
  Modifying test to fix OOM b/38045794 b/72326145