Merge "Reset dev.bootcomplete property during userspace reboot" am: 335be083e1

Change-Id: I5e1b89e299887ed37d4a02aac61abfa8320445cb