Merge "Cleanup code and documentation for SMS EF records"