Merge "Handle addition of system apps during OTA" into jb-dev