Merge "Avoid NPE when installing app update." into jb-mr1-dev