Clear the boot task at fork. am: e9455f61f7
am: 8b5e37baf5

Change-Id: I39a77754071a01df2b3ff76cbbcdf1d8352ba9f4