Increasing madness levels.

Change-Id: I879ef18f8fbe67796c38fe05933019dc575c625a
Merge remote-tracking branch 'legacy/kitkat' into kitkat