Fix a minor issue of "restore default" should also improve
performance as well.

Change-Id: I1a762ed78dc27bb711b652431481925c9bd1b8b5
6 files changed