Maintenance release

Change-Id: Icc85b62d587f3dd9c2856b11116d087407f78dda
Signed-off-by: Evan Anderson <evan@thelinuxman.us>
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging