Merge changes from topic "am-b39caaa3-4861-4759-a55f-8e0eb691097b" into nyc-dr1-dev

* changes:
  [automerger] httplive: detect oom if playlist is infinite am: f3808d3a2e
  httplive: detect oom if playlist is infinite