merge minor fixes from LGE p930 source