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

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

Change-Id: Ied247327d2aae2305c2b5a523fb6d80662f521c4
fix merge

Change-Id: I339fbe9ae8ae89900d8843f801051574bbab22ae