Merge "Standby list for dyn bce in potentially infinite loops." am: 06d1115174
am: f9f21e82a6

* commit 'f9f21e82a6431cf641c23d3051ffed6ab95df387':
  Standby list for dyn bce in potentially infinite loops.