Merge branch 'kk-3.4' into HEAD

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