Merge "Ensure single-step always causes global deopt"
am: b45a950bf2

Change-Id: I8c60e831ffbe16aab3cae488de8254039a9a8a3d