Linux 3.4.97 - squashed commit

Change-Id: Ia4752cf0579ecd45b07d2d72e98ebc1ebe308a19