JSS -> KTR

patch from mako-3.4-jb-mr2 to mako-3.4-kitkat-mr0