Squash me.  Saved spot for session persistence changes.

Change-Id: I27bef31451a8426a39ab27c877749e032c2f0ea1