HALO (2/2)

Change-Id: I886766e8c729904ffd54f4f3e7882ed59af1fe14

Conflicts:
	res/xml/settings_headers.xml