Merge branch 'cm' into HEAD

Signed-off-by: DHOMD <DHO@dho.im>

Conflicts:
	res/xml/device_info_settings.xml

Change-Id: I4428fa9537c2d5e2fdae5661699c4b12ac142994