Fix double end

Change-Id: Ibf4c5fcaa1948a32b275d68602e84a472a0921f8
Merge remote-tracking branch 'PA/kitkat' into kitkat-remix