Merge remote-tracking branch 'gfiber-internal/master' into newkernel_dev

Change-Id: Ic2d0c903b9916ea7ffe2144de2e1c58add13bc8a