Unbreak it

reconcile with cm-12.0... previous L5 branch had too much legacy residue

Change-Id: I2b03137807c2555e140014edd7560841a209d716