Merge "Change per-boot tag and remove rescope auth timeout tag."