Merge "Track lilbcore change 3ad0f67b98b61cc3f047e3cf6fe8f94d5f2ef5e5"