Merge "[DO NOT MERGE] Do not log boot times for secondary users and upgrades" into nyc-mr2-dev am: fcb06b3735
am: 34cf649e90  -s ours

Change-Id: I401b6356be18871631b2adc04b4c55a9437a965d