@hide new setting and move it to appropriate place.

Change-Id: Ic158b0c0581384e140984dca3e45c31e65868420
Merge "@hide new setting and move it to appropriate place." into jb42