Follow up fixes for expandhelper

Change-Id: I51fab5bee481889101e8f5553b9a5d9fe2cba6c3
Test: manual
1 file changed