Attach context to local.store a little earlier

Change-Id: Ibdfaf98a25cbb2a8a8839247b14db7a7928c2c3e