Merge "Further interruptiveness changes" into pi-dev am: fe1d9dc1af
am: bbaf6a4a6f

Change-Id: Ic6ac2a1ad921250fc751a643cd1b5ad58f8166e0