Merge "remove gatekeeper software module" into mnc-dev