Post-merge fixup
Merge commit 'faf65c5fb113981059836df8c040c583ff7a5ae9' into kitkat