Merge "Reset dev.bootcomplete property during userspace reboot" am: 335be083e1 am: 858459f8a2 am: 377d2a45d0

Change-Id: I2c6310c7b174c5e9b7215884550a76a0f9ae713a