Merge "Whitelist user_code_suspension_lock_ for ConditionVariable wait" am: 6c13ce8b am: 79121e45 am: eb6237ce am: 54dc46d0 Change-Id: Icfa71f567877182407edcb165d1d1f29096a9a18