Merge "Workaround NPE caused by packages missing signatures." into froyo