Merge remote-tracking branch 'caf/kk_2.7_rb1.30' into HEAD

Change-Id: Ide45f6333e363011ec2a82d1b410d8b4aa02e848