Restore Wlm optionals removed by mistake

Followup to I8782da81e585ae351cd98bf9b84c59466b674031

Change-Id: I624f97c3c7578bce43b4f8a78e730fb5739d7065