reflect changes to kitkat-release

from googlesource