Restore Settings.

Change-Id: Ie5c26869151dd8959c122bf3c748d61420ac5c30
12 files changed