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

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

Change-Id: Ib10fae59e46b59855d0b096ea9a7edc42cc6de0a