Fix a crash in package installer
am: 869786e3e4

Change-Id: Iece0247260ac00e60179a035acb66dd0278baaff