4.4 FINAL: Finalize this step

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge remote-tracking branch 'legacy/kitkat' into kitkat