Force merge of remaining KLP changes to fix build.

Change-Id: I389a23c6615663c325980fcb30350ea6635d2d17
1 file changed