Merge "Fix matrix dep on kernel configs" am: a806c0c3bd am: dc575a4184
am: ab266539fd

Change-Id: I6b2de14cb10d2fe5777e1d17c40b3e6e1d71609e