Part 2/2 updating to Kitkat when avaliable

Change-Id: I5958a3af7e5a848d8e8e860a103cff15de7ad854