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

Change-Id: Idb72c9edd40ecdf2b32a79f9870f87c08b75922c