Fix a crash in package installer
am: 869786e3e4

Change-Id: Ic1d8d6221194731a6c967f736a1352a905bba8b0