Merge "Add test for flag secure app" into mnc-dev