Merge "Add SYSTEM_DIR check to upgrade-key-set verification." into mnc-dev