Fix crash in ExpandHelper

Bug: 16645584
Change-Id: Ifbcd8c88cda0a390061c162aa43d8615d1311f19
1 file changed