Merge "Whitelist user_code_suspension_lock_ for ConditionVariable wait" am: 6c13ce8b4c am: 79121e452c am: eb6237ce61
am: 54dc46d06e

Change-Id: Icfa71f567877182407edcb165d1d1f29096a9a18