Merge remote-tracking branch 'mokee/jb-mr1_mkt' into HEAD

Conflicts:
	core/res/res/values/public.xml

Change-Id: I9d3c9b1856a80c63797e5c7b7f0e22a7b950b6fd