Sprout: trying to fix things up

Change-Id: I3161262960c35c60e2a107ab42eb8d017cf34f96
Merge branch 'cm-11.0' of https://github.com/rebelos/effing-ironman into HEAD