apply JB update from opensource.samsung.com

Change-Id: I894ab844f0ea52a7a91d01796d11e87a1c2f930d