Merge "Avoid strict mode violation during saveAttributeData" into mnc-dev