Switching to new message scheme for prefs per feature requirements

Change-Id: I84f440d29d3311c580d3ae5ac5b46c151e051e44
Merge "Switching to new message scheme for prefs per feature requirements"