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

Change-Id: I813558eff9ca2ac09507f80cc77e96d6d0e3f922