am 79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."

* commit '79c255ade3ed7ab00db8041dbf7e2a171cbc32b0':
  Change per-boot tag and remove rescope auth timeout tag.