Bury those beans

Change-Id: Id012dc441ff0bdce27f4778118990619a91e88d5
Merge remote-tracking branch 'PA-settings/kitkat' into kitkat-remix