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

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

Change-Id: I985425b53fc7b2d3cf15c5e0dc14bbd3f75950a8