Update for 3.x kernel

Change-Id: Ie53f80ed2e30cab4c418305613a27501da281e1a