Change 32659
Merge down dev -> dev_rebrand.
Local changes to template.sh were discareded; we'll need to redo those.
Local changes to template.sh were discareded; we'll need to redo those.
Tip: Use n and p to cycle through the changes.