Merge "Static field name prefix should be 's'" into mnc-dev