Red Team Go!  Red Team Go!

Change-Id: I4d6eb4b697311be6b2787ad739e5b18278f7817d
Merge remote-tracking branch 'aospa/kitkat' into kitkat