cherry-picks needed for u8500 samsung devices

Change-Id: I76c80bb7b0f5b9cc9dfbd2a293400372c7b0d7bd