Merge "[gatekeeperd] fix issue with SW->HW upgrades" into mnc-dev