Merge "Smarter set intersection between app image and non boot image strings"