Revert - apply P3110 JB Update1 from opensource.samsung.com