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

Change-Id: I320c26fc5afd7048d4f332255c66dca66a04c674