Merge \"Special case the suspend to runnable transition when locking.\"
am: 19c10147cd

Change-Id: I43369865ecb71f394f5d414e58bc5c1cbe523c80