Merge "Add test to verify the fix of Bug #21446448" into mnc-dev