Merge "Fix a deadlock between thread flip and suspend request." am: 81c6c8e6de am: d33bd5f68c
am: a352fa20d6

Change-Id: If0d095bdc66cb18574af1f69adfbbdf7b6e0d107