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

Change-Id: Ic258eaf306dc05850015808c9b67b07398575770