Merge "Do not remove speculative frames in all cases."
am: 0d7c0f78c4

Change-Id: Id4e5c240cb9c8d98f428a4a38764a65379d2dabb