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

Change-Id: I9fa612c75a375385ef8799c4d83cc6fc003d0074