4.4 FINAL: Finalize this step

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge pull request #2 from AOSPA/kitkat

4.4 FINAL: Finalize this step