apply JB update from opensource.samsung.com

Change-Id: Icc00ebd36d574392ca8a432a5af8c27fae87e124