Update to LK 5.4-exp2-230

Change-Id: Ie3fdeea01b30d1f600ac0317410559fffbecf8d4