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

Change-Id: I828a59ecc430d1371355cdcb5e95b5eb4b5e8674