DO NOT APPROVE UNTIL GLANCE IS READY TO SHIP. This should be the last commit before release. This will count as PTL signoff for release. Change-Id: If48e81f150bfd19146c00efe82fcd308e04dfcd0