@hide new setting and move it to appropriate place.

Change-Id: I02b50de9ba5b4aeab38acf6f9225908a4079b05a