Save astute keys and port them back to astute

Closes-Bug: 1353497
Change-Id: I5df75fc71fc7ac5d0fb6221caf6ab8097052eb71