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

Change-Id: I92c9e00343f4661d5c3619770db9c64fe9b825b8