kk_2.7-stable again

Change-Id: I49253d55ec5f4909e86d4047691d6fba8bc3fd17