Merged changes from Samsung OSRC GT-I9500 CHN JB Opensource Update2 to Update3.