Merge "Inject empty <kernel> tag if missing." into rvc-dev am: 7874c8d6e4

Change-Id: Ife92d70da5fec6968811b51928d393dbfa7479fd