4.4 FINAL: Finalize this step

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Merge "4.4 FINAL: Finalize this step" into kitkat

Change-Id: I56cc1ecd7bfbafe591c9c53284faa023a1e6b70d