bacon: SLIMBUX are the best bux

Change-Id: Ic98cdb213a0ed85031bda2f7c94a2013c3f55b68
Merge branch 'cm' into HEAD