Bury those beans

Change-Id: I19ec61ebb2def2cf3001a580eda7a25aea2f5dd9
Merge "Bury those beans" into kitkat
Merge remote-tracking branch 'PA-base/kitkat' into
kitkat-remix git fetch PA-settings