Merge remote-tracking branch 'gfiber-internal/linux-3.3.y' into HEAD

Change-Id: Ia0461e45f325d229d34d5145d3f5469c3738bd30