More `activate_lv` patching

Change-Id: Ie0c914facb61a966b8696191114149ecdd15de61