Merge "Don't log userspace_reboot.started/finished properties from init" am: 15e4f6fe5a am: 8e4014f2de

Change-Id: Ie2ca57a5644fe46a1edf52d27e50bfd459598f78