Add ScopedAllowThreadSuspension am: dc540dfffb
am: 05336509a4

Change-Id: I0521708ec252dc124da0d2cc8ff68433da905ba8