Merge branch 'kk-3.4' into HEAD

Change-Id: I9dc8da2532912c3f36478f7426115b2e2932d3f4
Signed-off-by: Tommy Alex <iptux7@gmail.com>