Version 6.0.4.8

Change-Id: I05cc1417f906cf2d3696bee457f4b095ee201a85
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0