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

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