Merge "[DO NOT MERGE] Do not log boot times for secondary users and upgrades" into nyc-mr2-dev