Fix up group fragment padding.

Change-Id: I0030dbef9afb54b08511b5a499225add1ef995a3
Merge branch 'cm-12.0' into mkl