Merge "Call markBootAttempt when serice manager available" am: 8e842dd365 am: e0a5a58bed
am: 877c36f6ea

Change-Id: I8b0676b714327c244720daa858d7212b59778c32