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

Change-Id: I560b21d0a56dcfeefeb3ee13ce47b56501fe02f6